Merge branch 'master' of git://git.denx.de/u-boot-i2c

The sandburst-specific i2c drivers have been deleted, conflict was just
over the SPDX conversion.

Conflicts:
	board/sandburst/common/ppc440gx_i2c.c
	board/sandburst/common/ppc440gx_i2c.h

Signed-off-by: Tom Rini <[email protected]>

diff --cc README
Simple merge

diff --cc arch/arm/cpu/armv7/vf610/generic.c
Simple merge

diff --cc arch/arm/include/asm/arch-kirkwood/config.h
Simple merge

diff --cc arch/arm/include/asm/arch-vf610/clock.h
Simple merge

diff --cc arch/arm/include/asm/arch-vf610/crm_regs.h
Simple merge

diff --cc arch/arm/include/asm/arch-vf610/imx-regs.h
Simple merge

diff --cc arch/arm/include/asm/arch-vf610/iomux-vf610.h
Simple merge

diff --cc arch/arm/lib/board.c
Simple merge

diff --cc arch/m68k/cpu/mcf5227x/cpu_init.c
Simple merge

diff --cc arch/m68k/cpu/mcf5227x/speed.c
Simple merge

diff --cc arch/m68k/cpu/mcf523x/cpu_init.c
Simple merge

diff --cc arch/m68k/cpu/mcf523x/speed.c
Simple merge

diff --cc arch/m68k/cpu/mcf52x2/cpu_init.c
Simple merge

diff --cc arch/m68k/cpu/mcf52x2/speed.c
Simple merge

diff --cc arch/m68k/cpu/mcf532x/cpu_init.c
Simple merge

diff --cc arch/m68k/cpu/mcf532x/speed.c
Simple merge

diff --cc arch/m68k/cpu/mcf5445x/cpu_init.c
Simple merge

diff --cc arch/m68k/cpu/mcf5445x/speed.c
Simple merge

diff --cc arch/m68k/cpu/mcf547x_8x/cpu_init.c
Simple merge

diff --cc arch/m68k/cpu/mcf547x_8x/speed.c
Simple merge

diff --cc arch/m68k/include/asm/global_data.h
Simple merge

diff --cc arch/m68k/lib/board.c
Simple merge

diff --cc arch/nds32/lib/board.c
Simple merge

diff --cc arch/powerpc/cpu/mpc8260/i2c.c
Simple merge

diff --cc arch/powerpc/cpu/mpc8xx/video.c
Simple merge

diff --cc arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c
Simple merge

diff --cc arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c
Simple merge

diff --cc arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
Simple merge

diff --cc arch/powerpc/cpu/ppc4xx/cmd_chip_config.c
Simple merge

diff --cc arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
Simple merge

diff --cc arch/powerpc/include/asm/ppc4xx-i2c.h
Simple merge

diff --cc arch/powerpc/lib/board.c
Simple merge

diff --cc board/BuS/eb_cpux9k2/cpux9k2.c
Simple merge

diff --cc board/BuS/vl_ma2sc/vl_ma2sc.c
Simple merge

diff --cc board/atc/atc.c
Simple merge

diff --cc board/bluewater/snapper9260/snapper9260.c
Simple merge

diff --cc board/cm5200/cm5200.c
Simple merge

diff --cc board/cpu86/cpu86.c
Simple merge

diff --cc board/cpu87/cpu87.c
Simple merge

diff --cc board/csb272/csb272.c
Simple merge

diff --cc board/emk/top9000/top9000.c
Simple merge

diff --cc board/esd/du440/du440.c
Simple merge

diff --cc board/esd/vme8349/vme8349.c
Simple merge

diff --cc board/eukrea/cpuat91/cpuat91.c
Simple merge

diff --cc board/freescale/mpc8349itx/mpc8349itx.c
Simple merge

diff --cc board/freescale/mpc8349itx/pci.c
Simple merge

diff --cc board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
Simple merge

diff --cc board/freescale/vf610twr/vf610twr.c
Simple merge

diff --cc board/ids8247/ids8247.c
Simple merge

diff --cc board/keymile/common/ivm.c
Simple merge

diff --cc board/keymile/km83xx/km83xx.c
Simple merge

diff --cc board/keymile/km_arm/km_arm.c
Simple merge

diff --cc board/lwmon/lwmon.c
Simple merge

diff --cc board/lwmon5/kbd.c
Simple merge

diff --cc board/mpl/pip405/pip405.c
Simple merge

diff --cc board/nvidia/common/board.c
Simple merge

diff --cc board/pm826/pm826.c
Simple merge

diff --cc board/pm828/pm828.c
Simple merge

diff --cc board/sandburst/common/sb_common.c
Simple merge

diff --cc board/sandburst/common/sb_common.h
Simple merge

diff --cc board/sandburst/karef/Makefile
Simple merge

diff --cc board/sandburst/karef/karef.c
Simple merge

diff --cc board/sandburst/metrobox/Makefile
Simple merge

diff --cc board/sandburst/metrobox/metrobox.c
Simple merge

diff --cc board/tqc/tqm8260/tqm8260.c
Simple merge

diff --cc board/tqc/tqm8272/tqm8272.c
Simple merge

diff --cc board/tqc/tqm8272/tqm8272.h
Simple merge

diff --cc common/board_f.c
Simple merge

diff --cc common/cmd_date.c
Simple merge

diff --cc common/cmd_dtt.c
Simple merge

diff --cc common/cmd_eeprom.c
Simple merge

diff --cc common/cmd_i2c.c
Simple merge

diff --cc common/env_eeprom.c
Simple merge

diff --cc common/stdio.c
Simple merge

diff --cc drivers/i2c/Makefile
Simple merge

diff --cc drivers/i2c/mxc_i2c.c
Simple merge

diff --cc drivers/i2c/ppc4xx_i2c.c
Simple merge

diff --cc drivers/i2c/soft_i2c.c
Simple merge

diff --cc drivers/i2c/tegra_i2c.c
Simple merge

diff --cc include/asm-generic/global_data.h
Simple merge

diff --cc include/configs/A3000.h
Simple merge

diff --cc include/configs/APC405.h
Simple merge

diff --cc include/configs/ASH405.h
Simple merge

diff --cc include/configs/B4860QDS.h
Simple merge

diff --cc include/configs/BSC9131RDB.h
Simple merge

diff --cc include/configs/BSC9132QDS.h
Simple merge

diff --cc include/configs/CANBT.h
Simple merge

diff --cc include/configs/CATcenter.h
Simple merge

diff --cc include/configs/CMS700.h
Simple merge

diff --cc include/configs/CPCI2DP.h
Simple merge

diff --cc include/configs/CPCI405.h
Simple merge

diff --cc include/configs/CPCI4052.h
Simple merge

diff --cc include/configs/CPCI405AB.h
Simple merge

diff --cc include/configs/CPCI405DT.h
Simple merge

diff --cc include/configs/CPCIISER4.h
Simple merge

diff --cc include/configs/CPU86.h
Simple merge

diff --cc include/configs/CPU87.h
Simple merge

diff --cc include/configs/CRAYL1.h
Simple merge

diff --cc include/configs/DP405.h
Simple merge

diff --cc include/configs/DU405.h
Simple merge

diff --cc include/configs/DU440.h
Simple merge

diff --cc include/configs/G2000.h
Simple merge

diff --cc include/configs/GEN860T.h
Simple merge

diff --cc include/configs/HH405.h
Simple merge

diff --cc include/configs/HIDDEN_DRAGON.h
Simple merge

diff --cc include/configs/HUB405.h
Simple merge

diff --cc include/configs/HWW1U1A.h
Simple merge

diff --cc include/configs/ICU862.h
Simple merge

diff --cc include/configs/IDS8247.h
Simple merge

diff --cc include/configs/IP860.h
Simple merge

diff --cc include/configs/IPHASE4539.h
Simple merge

diff --cc include/configs/JSE.h
Simple merge

diff --cc include/configs/KAREF.h
Simple merge

diff --cc include/configs/KUP4K.h
Simple merge

diff --cc include/configs/KUP4X.h
Simple merge

diff --cc include/configs/M5208EVBE.h
Simple merge

diff --cc include/configs/M52277EVB.h
Simple merge

diff --cc include/configs/M5235EVB.h
Simple merge

diff --cc include/configs/M5253DEMO.h
Simple merge

diff --cc include/configs/M5271EVB.h
Simple merge

diff --cc include/configs/M5275EVB.h
Simple merge

diff --cc include/configs/M53017EVB.h
Simple merge

diff --cc include/configs/M5329EVB.h
Simple merge

diff --cc include/configs/M5373EVB.h
Simple merge

diff --cc include/configs/M54418TWR.h
Simple merge

diff --cc include/configs/M54451EVB.h
Simple merge

diff --cc include/configs/M54455EVB.h
Simple merge

diff --cc include/configs/M5475EVB.h
Simple merge

diff --cc include/configs/M5485EVB.h
Simple merge

diff --cc include/configs/MERGERBOX.h
Simple merge

diff --cc include/configs/METROBOX.h
Simple merge

diff --cc include/configs/MHPC.h
Simple merge

diff --cc include/configs/MIP405.h
Simple merge

diff --cc include/configs/MPC8308RDB.h
Simple merge

diff --cc include/configs/MPC8313ERDB.h
Simple merge

diff --cc include/configs/MPC8315ERDB.h
Simple merge

diff --cc include/configs/MPC832XEMDS.h
Simple merge

diff --cc include/configs/MPC8349EMDS.h
Simple merge

diff --cc include/configs/MPC8349ITX.h
Simple merge

diff --cc include/configs/MPC8360EMDS.h
Simple merge

diff --cc include/configs/MPC8360ERDK.h
Simple merge

diff --cc include/configs/MPC837XEMDS.h
Simple merge

diff --cc include/configs/MPC837XERDB.h
Simple merge

diff --cc include/configs/MPC8536DS.h
Simple merge

diff --cc include/configs/MPC8540ADS.h
Simple merge

diff --cc include/configs/MPC8541CDS.h
Simple merge

diff --cc include/configs/MPC8544DS.h
Simple merge

diff --cc include/configs/MPC8548CDS.h
Simple merge

diff --cc include/configs/MPC8555CDS.h
Simple merge

diff --cc include/configs/MPC8560ADS.h
Simple merge

diff --cc include/configs/MPC8568MDS.h
Simple merge

diff --cc include/configs/MPC8569MDS.h
Simple merge

diff --cc include/configs/MPC8572DS.h
Simple merge

diff --cc include/configs/MPC8641HPCN.h
Simple merge

diff --cc include/configs/MVBLM7.h
Simple merge

diff --cc include/configs/OCRTC.h
Simple merge

diff --cc include/configs/ORSG.h
Simple merge

diff --cc include/configs/P1010RDB.h
Simple merge

diff --cc include/configs/P1022DS.h
Simple merge

diff --cc include/configs/P1023RDB.h
Simple merge

diff --cc include/configs/P1023RDS.h
Simple merge

diff --cc include/configs/P1_P2_RDB.h
Simple merge

diff --cc include/configs/P2020COME.h
Simple merge

diff --cc include/configs/P2020DS.h
Simple merge

diff --cc include/configs/P2041RDB.h
Simple merge

diff --cc include/configs/PCI405.h
Simple merge

diff --cc include/configs/PIP405.h
Simple merge

diff --cc include/configs/PLU405.h
Simple merge

diff --cc include/configs/PM826.h
Simple merge

diff --cc include/configs/PM828.h
Simple merge

diff --cc include/configs/PMC405.h
Simple merge

diff --cc include/configs/PMC405DE.h
Simple merge

diff --cc include/configs/PMC440.h
Simple merge

diff --cc include/configs/PPChameleonEVB.h
Simple merge

diff --cc include/configs/R360MPI.h
Simple merge

diff --cc include/configs/RPXClassic.h
Simple merge

diff --cc include/configs/RPXlite.h
Simple merge

diff --cc include/configs/RRvision.h
Simple merge

diff --cc include/configs/SIMPC8313.h
Simple merge

diff --cc include/configs/SXNI855T.h
Simple merge

diff --cc include/configs/Sandpoint8240.h
Simple merge

diff --cc include/configs/Sandpoint8245.h
Simple merge

diff --cc include/configs/TASREG.h
Simple merge

diff --cc include/configs/TK885D.h
Simple merge

diff --cc include/configs/TOP5200.h
Simple merge

diff --cc include/configs/TOP860.h
Simple merge

diff --cc include/configs/TQM8260.h
Simple merge

diff --cc include/configs/TQM8272.h
Simple merge

diff --cc include/configs/TQM834x.h
Simple merge

diff --cc include/configs/TQM855M.h
Simple merge

diff --cc include/configs/TQM866M.h
Simple merge

diff --cc include/configs/TQM885D.h
Simple merge

diff --cc include/configs/VOH405.h
Simple merge

diff --cc include/configs/VOM405.h
Simple merge

diff --cc include/configs/W7OLMC.h
Simple merge

diff --cc include/configs/W7OLMG.h
Simple merge

diff --cc include/configs/WUH405.h
Simple merge

diff --cc include/configs/acadia.h
Simple merge

diff --cc include/configs/alpr.h
Simple merge

diff --cc include/configs/amcc-common.h
Simple merge

diff --cc include/configs/aria.h
Simple merge

diff --cc include/configs/astro_mcf5373l.h
Simple merge

diff --cc include/configs/bamboo.h
Simple merge

diff --cc include/configs/bluestone.h
Simple merge

diff --cc include/configs/bubinga.h
Simple merge

diff --cc include/configs/canyonlands.h
Simple merge

diff --cc include/configs/corenet_ds.h
Simple merge

diff --cc include/configs/cpuat91.h
Simple merge

diff --cc include/configs/csb272.h
Simple merge

diff --cc include/configs/csb472.h
Simple merge

diff --cc include/configs/debris.h
Simple merge

diff --cc include/configs/dlvision-10g.h
Simple merge

diff --cc include/configs/dlvision.h
Simple merge

diff --cc include/configs/eXalion.h
Simple merge

diff --cc include/configs/eb_cpu5282.h
Simple merge

diff --cc include/configs/eb_cpux9k2.h
Simple merge

diff --cc include/configs/ebony.h
Simple merge

diff --cc include/configs/ep8260.h
Simple merge

diff --cc include/configs/ethernut5.h
Simple merge

diff --cc include/configs/gdppc440etx.h
Simple merge

diff --cc include/configs/icon.h
Simple merge

diff --cc include/configs/intip.h
Simple merge

diff --cc include/configs/io.h
Simple merge

diff --cc include/configs/io64.h
Simple merge

diff --cc include/configs/iocon.h
Simple merge

diff --cc include/configs/katmai.h
Simple merge

diff --cc include/configs/kilauea.h
Simple merge

diff --cc include/configs/km/keymile-common.h
Simple merge

diff --cc include/configs/km/km83xx-common.h
Simple merge

diff --cc include/configs/km/km_arm.h
Simple merge

diff --cc include/configs/km82xx.h
Simple merge

diff --cc include/configs/km_kirkwood.h
Simple merge

diff --cc include/configs/korat.h
Simple merge

diff --cc include/configs/luan.h
Simple merge

diff --cc include/configs/lwmon.h
Simple merge

diff --cc include/configs/lwmon5.h
Simple merge

diff --cc include/configs/makalu.h
Simple merge

diff --cc include/configs/mecp5123.h
Simple merge

diff --cc include/configs/mpc5121ads.h
Simple merge

diff --cc include/configs/mpc8308_p1m.h
Simple merge

diff --cc include/configs/mpq101.h
Simple merge

diff --cc include/configs/neo.h
Simple merge

diff --cc include/configs/nhk8815.h
Simple merge

diff --cc include/configs/ocotea.h
Simple merge

diff --cc include/configs/otc570.h
Simple merge

diff --cc include/configs/p1_p2_rdb_pc.h
Simple merge

diff --cc include/configs/p3p440.h
Simple merge

diff --cc include/configs/pcs440ep.h
Simple merge

diff --cc include/configs/pdnb3.h
Simple merge

diff --cc include/configs/quad100hd.h
Simple merge

diff --cc include/configs/redwood.h
Simple merge

diff --cc include/configs/s5p_goni.h
Simple merge

diff --cc include/configs/s5pc210_universal.h
Simple merge

diff --cc include/configs/sacsng.h
Simple merge

diff --cc include/configs/sbc405.h
Simple merge

diff --cc include/configs/sbc8349.h
Simple merge

diff --cc include/configs/sbc8548.h
Simple merge

diff --cc include/configs/sbc8641d.h
Simple merge

diff --cc include/configs/sc3.h
Simple merge

diff --cc include/configs/seaboard.h
Simple merge

diff --cc include/configs/sequoia.h
Simple merge

diff --cc include/configs/snapper9260.h
Simple merge

diff --cc include/configs/socrates.h
Simple merge

diff --cc include/configs/spc1920.h
Simple merge

diff --cc include/configs/stxgp3.h
Simple merge

diff --cc include/configs/stxssa.h
Simple merge

diff --cc include/configs/t3corp.h
Simple merge

diff --cc include/configs/t4qds.h
Simple merge

diff --cc include/configs/taihu.h
Simple merge

diff --cc include/configs/taishan.h
Simple merge

diff --cc include/configs/tegra-common-post.h
Simple merge

diff --cc include/configs/top9000.h
Simple merge

diff --cc include/configs/trats.h
Simple merge

diff --cc include/configs/trimslice.h
Simple merge

diff --cc include/configs/u8500_href.h
Simple merge

diff --cc include/configs/uc100.h
Simple merge

diff --cc include/configs/utx8245.h
Simple merge

diff --cc include/configs/vct.h
Simple merge

diff --cc include/configs/vf610twr.h
Simple merge

diff --cc include/configs/vl_ma2sc.h
Simple merge

diff --cc include/configs/vme8349.h
Simple merge

diff --cc include/configs/walnut.h
Simple merge

diff --cc include/configs/whistler.h
Simple merge

diff --cc include/configs/xpedite1000.h
Simple merge

diff --cc include/configs/xpedite517x.h
Simple merge

diff --cc include/configs/xpedite520x.h
Simple merge

diff --cc include/configs/xpedite537x.h
Simple merge

diff --cc include/configs/xpedite550x.h
Simple merge

diff --cc include/configs/yosemite.h
Simple merge

diff --cc include/configs/yucca.h
Simple merge

diff --cc include/configs/zeus.h
Simple merge

diff --cc include/fdtdec.h
Simple merge

diff --cc include/i2c.h
Simple merge

diff --cc lib/fdtdec.c
Simple merge